From 62996c01c135e1b116c8b0ab507a9bcd207f1394 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 6 Jul 2010 17:31:04 +0100 Subject: [PATCH] tools/ocaml: Fix up ocaml build for timer_mode, hpet and vpt_align c/s da46b25cf17d broke the ocaml build. This fixes it. Signed-off-by: Ian Jackson --- tools/ocaml/libs/xl/xl_stubs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ocaml/libs/xl/xl_stubs.c b/tools/ocaml/libs/xl/xl_stubs.c index 4b351c2439..07809fd5cd 100644 --- a/tools/ocaml/libs/xl/xl_stubs.c +++ b/tools/ocaml/libs/xl/xl_stubs.c @@ -97,9 +97,6 @@ static int domain_build_info_val (libxl_domain_build_info *c_val, value v) CAMLparam1(v); CAMLlocal1(infopriv); - c_val->timer_mode = Int_val(Field(v, 0)); - c_val->hpet = Int_val(Field(v, 1)); - c_val->vpt_align = Int_val(Field(v, 2)); c_val->max_vcpus = Int_val(Field(v, 3)); c_val->cur_vcpus = Int_val(Field(v, 4)); c_val->max_memkb = Int64_val(Field(v, 5)); @@ -116,6 +113,9 @@ static int domain_build_info_val (libxl_domain_build_info *c_val, value v) c_val->u.hvm.nx = Bool_val(Field(infopriv, 3)); c_val->u.hvm.viridian = Bool_val(Field(infopriv, 4)); c_val->u.hvm.timeoffset = String_val(Field(infopriv, 5)); + c_val->u.hvm.timer_mode = Int_val(Field(v, 0)); + c_val->u.hvm.hpet = Int_val(Field(v, 1)); + c_val->u.hvm.vpt_align = Int_val(Field(v, 2)); } else { c_val->u.pv.slack_memkb = Int64_val(Field(infopriv, 0)); c_val->u.pv.cmdline = String_val(Field(infopriv, 1)); -- 2.30.2